merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 7 Sep 2011 04:02:15 +0000 (13:02 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 7 Sep 2011 04:02:15 +0000 (13:02 +0900)

Trivial merge